Bug fixes and armory