Fixes.
Added some more module hooks.