minor bug fixes
Merge pull request #93 from AndroidTresLeches/event_feature

minor bug fixes