Hopefully you will be able to avoid them. In the future, the worst thing you can do is turn it into a tug of war. That's rewarding to him, playtime! Again,, stop, have him focus on you. Any commands he knows "sit" "down" Paw" - keep his focussed on you, and calm. The MINUTE he starts to act up, stop and repeat. I am glad things are working so far, just wanted to caution you!
I am sure passersby thought I was insane when walking my former bosses' Sheltie, but I'd have to say "Heel" every 30 seconds or so when we were on our way back to the office or back home, as otherwise he's pull and choke himself, he was soooooooooo focussed on the biscuit he knew he'd get once he got inside. As long as I kept breaking that concentration, we could walk.
Bookmarks