more tweaks

more tweaks