Cleaned up the stuff we discussed on Monday (hopefully). Added code to make the tree use old metrics so that the tree is less weird on boot