Adds some combinators (and renames times)
Doc fixes