More tweaks and changes.  Hopefully works with upgrades better now.