Tested and fixed bugs, implemented custom events