comments and small changes