I tried to fix the borking. I think it unbork nao. Well, JournalWriterTest is still complaining, but I don't know if you changed it or what.