Draw::draw method doesn't need context arg, added 'Rect', and some misc fixes