minor tweaks and changes.