General tweaks. More work on dial device.