Updates

Closes #68 and closes #67