Corrections from parte1 except show comment errors