Reading Through Code

… and making notes, small changes, adding some comments.
Merge branch 'develop'