Various tweaks and updates. Test.cpp is in upgrade works.