More errors corrected