some annoying little bug with drawing, almost fixed