Updates for Touch

Updated the file for Touch only and fixed some bugs