Dont add highlights unless comment is made and handle the dialog a little bit nicer.