Fixed most of the journal mess. We still have it as a dependency and need to totally remove.