Clean-up
Minor changes
Fixed unit selection bug
Stuff