Minor: formatting and whitespace
Canopy mode control bugfix
Language update bugfix.