Corrected recursion loop on switch to switch connections, and added back the restriction on endpoint device :: endpoint port #74