More work on settings, adding input support