more tweaks and updates