Minor Fixes

Assure correct control association
Correct spelling mistakes