fixed calls declarations
implemented the new way to define services
typo
redefined some services