Trill connected callback finagling
Slight Plume callback renaming/commenting