Fixed touch count bug (maybe). Fixed one-touch map-move bug