couple of comments and little fixes