final commit, minor corrections to comments