Fixed the ridiculously complicated services info