Fixed commenting and fixed some custom error messages