tweaks & bug fixes
many tweaks and bugfixes