Added support for human-friendly times & durations + minor fixes & refactorings