most of the fixes for controls