few tweaks & bugfixes