more tweaks to draw order