made last changes and tests - all is good