fix cat names and reorder functions