Noted a bug in the TODO
Fixed keyboard and direct manipulation movement bug
Merge branch 'master'