Add ij.jar, clean up boilerplate