Fixed some draw order stuff + a SO