Some good results, with the ABC as well as the metric test.  Cleaned up
a bit.