More tweaks

Fixing collisions
balancing pistold