made cp5 drawing dependant on debugdraw, cleanup