Fix pickup exploit. Fixes #70
Fix containers. Fixes #69