major improvements to initialization, classes, instrumentation, etc