Bunch of comment and conent updates