I think I've fixed all of the bugs associated with pickups.