Fixes #59 and also made lakes even rarer
Fixes #58