#186 closes,
#198 closes
closes #186, closes #189