Minor changes, still work to do on upgrading.