Better procedural generation

Marginally better, anyway.