closes #74
closes #72
closes #71