Merge pull request #574 from n8fr8/master

a few issues
rough update of commits/changes for 14.0.6 BETA
more to do...