Correct some meta info, better substring