Fixed a few bugs with the drawing.