lots of fixes
more tweaks