fix comments
Merge branch 'fix-init'