Initial round of debugging