changed shape width and height; made oval drawing less dependent on magic numbers; improved drawing of squiggles