Added some more comments to classes that need to be updated.
Merge remote-tracking branch 'origin/wop' into wop
Merge remote tracking branch