Added more annotations, updated journal