Current adjustments getting close on configuration tool.

Still a lot to do to finish both ends.
Merge pull request #380 from Jedwondle/master

Current adjustments getting close on configuration tool.