minor tweaks and updates
minor tweaks and updates