Features/trivial tweaks

Just some trivial stuff building on top of pull request #2