Takes care of minor issues with terrain generator

I'll keep adding commits to this so you can keep track, we can merge them all together later?