state change and error handling bugs and tests
started work on weapon loadout selection, improved test coverage