Add/move/change some comments