Bring in latest fixes.  No flow included, too much headache.

Need to do another release and tags another day..