I have this question..

Is it: Did Ты already left when the trouble had started? или Had Ты already left when the trouble started?

And also I want to ask about this sentence:
I (be) ______ sorry to her, because I (not be) ______ nicer to her.
Is it: I was sorry to her, because I hadn't been nicer to her.