some changes in option parser/minor fixes