more tweaks & updates