Waypoint editor

Small fix that I forgot to merge with #174.