tweaks and updates