Add remove/stop and more comment docs
Update block arguments
Rename protocol method
Eliminate TODO
Update comments