* Various bug fixes now that this is being tested...still not done.
* Various bug fixes now that this is being tested...still not done.

jwiggins/keyenst,ilanschnell/ironpkg,ilanschnell/ironpkg,jwiggins/keyenst