Prefab Errors Fixed

Their dialogues now point to the right things and will be collected
properly.
Git Merge Manual

Woo.
Merge pull request #326 from Kiroshima/master

Fixed Prefabs