Base, etc.   :   various tweaks, added DeviceSelector to Base, fixed some bugs that cropped up.  Added container prefix to DeviceSelector.