minor changes, some resulting from conversation Friday; fixed beginShape/endShape problem, but then didn't like the result, so I commented it back out