Options table refinement

Some of the options are not in the 1 release and have been removed.
Others have been added that were missing. Issue #7