fixed sw_stub and updated topologies