closes #73
closes #70