Changes to Adaptive and Oracle GBH. Mainly streamlining code
and improving presentation.