Merge pull request #743 from gorco/prefabsImprovements

Prefabs improvements
w.i.p
w.i.p.2