more control improvements