minor fixes to allow tree topology to work
fixed switchlink bugs