Added comments, cleaned up alpha ordering of test callbacks. No code changes. Almost there to 2.0.