Minor tweaks

* See file changes.