Added a bunch of comments.
Merge origin/master