Bunch of comment fixes