Fixed first round of comments