more fixes
more tweaks