E1S1: removed NO_ECONOMY stuff, and corrected some unit placing