is this sentence gramatically correct

<p>"Yet the smile on his face remained unwavering: it was there when he greeted me in, when I would check my cell-phone, and even when he would lose."</p>

<p>not sure if lack of parallelism or not. this is for my college essay btw, not SAT, but figured y'all knew</p>

<p>this one too:</p>

<p>“Every day he found time to spend with me, precious time that we passed with a casual board game.”</p>

<p>1) should it be precious time “which” we passed (rather than precious time “that” we passed)
2)should there be a comma in the middle, or am i using the wrong punctuation? would anyone care to re-structure this sentence if so?</p>

<p>They are both correct as written.</p>