Various tweaks to js for better readability. Fixed 2 events in dummy data