Cleaned up some files and fixed some bugs, also started working on touch devices
fixed merge