Some minor tweaks --- thanks Daniel!!