fix connections not being terminated properly when using completion blocks
fix connections not being terminated properly when using completion blocks

turns out we do need to send the notifications all the time

also replace a load of _ with self

celsworth/argus,celsworth/argus