Fix weights & update final table