Remove unneeded default
Improve support for touch
Make function name clearer
Make variables default
Merge branch 'feature/update' into develop