Fix comments/doc