some enhancements - trying to get it to finish in a timely manner :-)