Rtsp

Fixes three of the items identified in #612.
Don't merge yet.  I've got another change to push against this.