Yes - I love the addition of both. I am happy so far with the way it was incorporated into the game. I had been worried about the instant airship travel, but it actually feels about right.