add comments, add remove option