done with first round of debugging