more services, more fixes