Added some more distinguishing things for event types
Works perfectly on osx now