Closes #210
* And minor adjustments