comments and small changes.