knob control, reorganization
minor changes