updates

- proper duration handling in TimesController
- merge in timekeep.js