formating
some random and minor fixes
fix #1737, switch jodav to bux578
Merge pull request #1740 from bux578/switchUnitsNorForPlayable

fix #1737, bux made me merge it