I think you've hit your stride with the story in this chapter. I haven't been commenting because I really haven't had anything to say that hadn't already been said.

The tale at the beginning does end rather abruptly, but fairy tales seem to do that anyway.

This draft feels tighter than the original version. It seems to be moving faster, at any rate.