Added more network control, and fixed an error with circular redirects