Some changes for the touch-screen drawing stuff...