closes #212, closes #217