minor tweaks and changes