Added option in demo to disable waypoint redirection (and fixed typos in subnet.py)