Added error msgs, improved test cases, wrote to journal