closes #194
closes #73
closes #189
closes #207