closes #797
closes #796