Syntax level fixes
Button fix: don't query all buttons in main.
Merge branch 'stable'