update to the high water helper and UTF8 safety