Redux'd maint, new armory, Local maint, added stuff from feedback