overall improvements to the FX control scheme