first fixes before contribution

This pull-request contains a few quick-fixes before I want to start building a new pull request in which I can work out the promise-resolution based version of eventtracking. (See the trackeable-events branch for more details).