Various Enhancements

Various enhancements.  See commits for details.