Touching up the rest of debugging