huge additions to spec editor, small changes to simulator