adding some minor tweaks following feedback