fixes and closes #914 and updates #907