Add some syntax changes to journal.py and tempaltes