Change traces order and fix descriptions