armory design improvements, not quite there yet though