Physics (pickup) Enhancements

Please see commit messages for precise details. A summary is as follows:

Pickups work properly now :D