closes #404
closes #406