added some notes to code
Merge branch 'master' into feature/client-moves

* master:
  added some notes to code