Patch  17

Fixes for structure bugs and pistol glitch, along with other
improvements