Yes, all of that! I love it so much, OMG. Honestly I think out of all the changes they made from novel to drama - and I love so many of them - this is unquestionably the best one: the way Shen Wei is not at all trying to avoid Zhao Yunlan in any way, shape or form, but instead pushes himself into his life and his awareness at every possible opportunity. :D