Support for waypoint timeout

Also fixed re.findall getting caught up on the effects class