Fixes pt.2

Prefabs weren't updated
Also, we're missing a reference in CollisionHandler.  It's not assigned
by default.