new pick ups and some fix ups!