many debugging changes