Fixes click handler, event delegation bug and updates example