some more enhancements - still (so far unsuccessfully) trying to get it to finish in a timely manner :-)