Improves connecting & switch_* sections, minor cosmetic fixes