a few tweaks & bugfixes
bugfixes & tweaks