WIP: Improvements from user suggestions

Ah, that ophyd PR now makes sense.