Some bugfixing on the wipe service

Currently hanging on stopping shock, oddly