I'm not sure if you're still working on this, or even if you would still take suggestions, or beyond that even if you're still here, but in the off-chance...
I'd like to suggest you add in Li's song, as well as perhaps more things to interact with - nothing special, just perhaps, more beds, and some rocks and objects to sit on?
Li's song I am only suggesting so that you can recall him when he gets stuck or lags behind.