fixed a few small pickup bugs