fixes for controls, etc.