Fixing services

Not entirely done though