fixed the isolation of guest networks and code cleanup