add touch handling, update docs, versions
fix merge conflicts