Made some comment fixes. Also Git shows that I would have not committed
changes on multiple of files even I think I have.