[amends #95] Final tweaks before pull request