More futzing with controls