Made bugs fixes to journal