More worldgen tweaks

* Also removed Factorization