improved the way expression options are handled
improved options and comments
updated tests for new options format
improved options and comments