armory: more tweaks