Style cleanup
Fixed event bugs
Fix other event issue with default route