done issue #83; work on issue #89