Prefab fixes, collision detection.
2nd pull from semvid repo