Remove some unneeded function declarations
Add inital touch support
Fix output to surface coordinate compuatations