some tweaks and updates