LARJ, plus tests, plus a whole bunch of fixes for bugs that cropped up.