Fix name, column order and other small things.