Clean up install of JJB and add instrumentation