comments and little fixes