cleaning up a bit
added the patched AJ library and moved the instrumentation over.