Changes to props, minor bugfixes
Merge
Made props from world generator be children to the Terrain object