You could fix all of this confusion by simply time skipping into a morning and doing a summary. Where we could be at a Inn and allowed some idea of companionship fall into place. I am barely following what is going on as is, and this could help.