Changed lock release in poll thread to try finally clause. Fixed control mode selection.  Tweaked initial params for waterfall.  Nothing much to see here.