some MORE new pick ups and fix ups