Fix two problems:
1. timeouts for nodes weren't getting reset when they had a mode ransition, so they were timing out in shutdown after changing modes. 2. It was still going back into a blocking wait, even though a signal had been recieved, and not quitting back up to the main loop to handle it.
Showing with 16 additions and 10 deletions