Saving formations #131, Master of Forge #136

bugfixes