More reliable waiters
Now watching removed nodes
Cleaned up some code