Fixed service breaking bugs

Turns out it basically wasn't working at all before...