add code to detect the wacom mouse and treat is as a mouse
General pruning and tidying