minor tweaks and updates