Bug fix and manual entry duration calculation