Added lots of stuff in units and terrain