7 Fix comments