Working in some hints from the Reviewer. Great thanks to them!