Thank you, Jingbei!

1. I like the expression “made me uncomfortably self-conscious". Accepted.

2. Both are correct, but FWQ's version sounds better. What can I say? She shares bed with a native speaker, and I live in a marginalized immigrant community -- 上下班時路過美國而已:)