Commit #5 - small changes, and addition of comments