minor bug fix
better touch management