About The Agreement

About The Agreement

The passage below comes from Mastermind: How to Think Like Sherlock Holmes By Maria Konnikova.

http://www.theglobeandmail.com/technology/science/brain/book-excerpt-how-to-look-at-the-world-like-sherlock-holmes/article8115992/?page=all

I remember the rise and fall of his voice as the suspense mounted beyond all breaking points, and finally, finally, at long last the awaited solution, when it all made sense and I’d shake my head, just like Dr. Watson, and think, Of course; it’s all so simple now that he says it. I remember the smell of the pipe that my dad himself would smoke every so often, a fruity, earthy mix that made its way into the folds of the leather chair, and the outlines of the night through the curtained French windows. His pipe, of course, was ever-so-slightly curved just like Holmes’s.

I'd like ask a question regarding the two underlined phrases.
First, 'a fruity, earthy mix' seems an added description of 'the smell of the pipe'.
So I think it can be paraphrased as follows: which (=the smell) was a fruity, earthy mix...
(Am I right?)

Second and last, 'the outlines of the night'. This one is tricky. It seems to agrees with 'I remember' independent of 'a fruity, earthy mix'.
I mean the author remember the smell of the pipe and the outlines of the night on the night of her father reading Sherlock Holmes.
(Am I right?)

But on second thought, the phrase made me ask whether 'the outlines of the night' can agrees with 'made its way into'. So 'the smell of the pipe' slides by the folds of the leather chair, and then goes into the outlines of the night. The strength of this guessing seems to be that it keeps the focus of the passage on 'the smell of the pipe'.

But I'm not sure which is better.

Hope for your replies.

Regards.