fix comments
Merge branch 'master' into callbacks