Work on terrain generator, small cleanup