A little bit of world generation
Minor cleanup