2.67-72 and some comment cleanup