more tweaks fixes