World gen continued and slight refactor