Todos added, changes to duration handling