Merge pull request #6 from ParadiseSS13/master

Merge from Master
Merge pull request #7 from ParadiseSS13/master

Merge from Master
Production and Mecha Tweaks
Merge pull request #34 from Fox-McCloud/Production-Tweaks

Production tweaks