More work on code for touchpad
Fixed bounding boxes