Updated some more graphics calls