bugfixes. Starting to add touch/mouse events