Refactoring, bugfixed tipcars service.
Merge