Added additional comments, minor fixes