Some clean up and added water back into terrain tile generation.