reorganized crosshair switcher, finished intergration