Major revisions complete; debugging