fixed problems with services
some comments and fix
structure