Various clean-ups, fixes, and updates based on trying to run the note…

…book

Some related to Bobby's signal loss stuff, some just prettying things up, a few bug fixes