Mostly fix town generator