Changed to only assign commands that have actual controls. Also fixed bug with too few controls.