Comment fixes

Some minor changes, fix and add comments.