Time tracking and bug fixes for journal