done issue #74; work on issue #72