fixing error with self-transitions, adding support for multiple waypoints in a given region