Tweaks for addon and event stuff, now back to work on the second part :)