Added water, made sides on terrain, refactored