Waypoint fix

Using a more complete waypoint object.

This is part of pull #185.