https://www.youtube.com/watch?v=s153C2xu1nk

Fixes, additions - a little late due to holiday, but here!