Added more parameters to optiontext
added some comments