lots of comments changes