Cleanup
lastOr combinator
simplified representation of Journal - extra type ctor not needed
more progress on journaling