Touch fixes and event driven core