update todo
correction to duration
Merge branch 'development'