Small updates to comment and threading.

Still need to figure out the threading and signal model here.