Pulling some changes from the Glace branch
Necessary Armada mods