Some fixes and spawining units
Merged