Alright, got it.
Now, I got lucky and found the merchant, enabling me to continue on. But after the first, I think three quests it says I need to increse her affection, how do I do that? Talking to her doesn't seem to help, and she offers no more quests before the affection is rised. She's at...