Some nicer water spawning, and fix chests