More improvements

Height is "fixed", but there is still an issue with lakes generate in an
L shape consistently.