fixes and organization to journal 2