closes #876
closes #751