Add max-backjumps and reorder-goals