Add events, fix pre hook.