fixing services and some other stuff