Still fixing locations of comments