closes #430
closes #427
closes #429
closes #418
closes #422
closes #416