fixed promises, updated services and controllers