Some more work on events & updated for MC 1.5