Fixed draw functions. YEAH