Register the events.
cleanup

Signed-off-by: Clienthax <clienthax@gmail.com>
Add missing @Overrides

Signed-off-by: Clienthax <clienthax@gmail.com>