some tweaks
more fixes
bugfixing