Add a journal
Typos, database refactoring