solves #7 with fuck-ugly solution of firstdraw bool
merge fix