Remove ^W from docs
Merge remote-tracking branch 'origin' into reformatting
added some more comments