Terrain Type converted to Terrain

Road Type and Water Type added and Terrain Type modified to exclude Road
and Water