fix, cleanup drawing