more tweaks!!