Minor tweaks & bugfixes