improve key controls