adding comments and options