improved journal parsing