added Settings, restructured, multi-input improvements