done issue #98; work on issue #106