got rid of skipwrapper and touch/mouse fixes