Bug/fixed events not showing up

Final commit with all Sunday Pull Requests included and functional.