added proper touching, added proper resolution scaling (almost)