update code to match current spec

removed a number of options
updating dist files