Attempted Bug Fixes

Attempted to fix touch bugs. Not Complete!