Fixed some more crazy enable/disable bugs.

Also removed the unnecessary service argument to most methods and replaced it with calls to getService().
Added separate triggered and ongoing notification actions.