Armalis additions, tweaks.