Fixed #36

+ Formation edge fade
+ Fix up calculations for formation/extra units
+ extraUnit fixes