minor clean-ups
built main controls switching scaffold