Fixing comments / error messages