some bugs corrections to make it works on touchpad