input fixes, input is working now
Merge branch 'master' of https://github.com/alexvw/canvas-experiment-1