fixed some TODOs
minor refactoring of events fragment