Changes to controls following first round of testing.