added comments options, corrected messages