fixed duplicated entries, added missing entries, fixed some entries order