updates to dapp as a partial attempt to preload and to handle nested transitions better.