Remove unused debug code
Add comments
Fix wrong control button