Minor style fixes and better population setup.