Modifications from master branch (committed first here)
Timing sets, time limits ...