refs #54 -fixes for option handler