Mostly fixed comments