Misc fixes as per Tam's comments.
Merge pull request #24 from CodeCoreYVR/event_c

Misc fixes as per Tam's comments.