Better Scala 2.10 support (using TrieMap instead of Java's ConcurrentHashMap).
Continuing to replace Longs with Duration.
Typo's.