Maybe extend the end of your training and do some training in the house. Some reps on things the dog has down pat after you have gone back in the house to help end your sessions on a positive note. After implimenting this for a while, this may have the additional benefit of conditioning the dog to be excited to go back inside because he has some more fun ahead of her. As far as the walk, maybe more distractions away from the distractions. By that, I mean get the dog focused on something that drives the dog. Toy or treat to help motivate the dog to move with you lots of praise for correct behavior. I would try to spend time in a calmer environment. This advise is coming from a novice, so if my advise sucks, that’s why. Lol. Good luck.