Fishing plan with Canada gives US more cod, less haddock