Meh fixes

Weapons not being removed and other stuff fixed.