minor fixes and cleanup of world gen