Few tweaks to stuff and things
* fixed WorldGenerator to work with new system