converted terrain type ints to enum
cleaned up