comments and tiny fixes