Full age transitioning fixes. Should all go through. Also cleaned up some.