Non-fiction books on whales and/or octopus?

I want to learn more about them. Nothing crazy, just some broad information, history of the species, how they live, etc.

There's one about the soul of the octopus, forgetting the name, so that's on my list.

Any other good suggestions?