- adapted to time-engine API changes
 - minor fixes