Added time service and fixed error service.