Minor post-merge adjustments
Rename connected? to running?