Fixing controls bug, adding controls to demo