This video does not mention Bonjour in the Win7 setup. This seems an oversight, yes? Also, as to the adhoc network, I did not set this up in Win7 but instead run on my in house wifi network and everything works fine. Should I change this and instead do things the way you suggest? 
As to the rest of the info, this is much appreciated.