Terrain adds and fixes