Playing mods

Added a couple of hooks and fixed what I *think* is broken.