Added touch
Fixed bugs (I think)