Mostly fixing comments.