Several tweaks

Closes #166 and closes #167.