Better header parsing, normalize SQL.