move some drawing functions back away from Graphics2D because of inaccuracy