MORE bounds checking

Also some code cleanup for DrawingView