Various little changes. Naming. Durations as arguments.