checking in various updates to ui/weapons system