move the comments in the right place, add my comments