Fix comments and add the wizard info.