Cleaned up the drawing stuff some