cleaned up comments
Merge remote-tracking branch 'origin/wip' into wip