zero-downtime experimental change + misc fixes

I sent you an email about this.  It's an experiment for a starphleet change i'm thinking about making.  Works for the most part, but not fully tested yet and I wanted to get some feedback.  The email has more info.