expand scope of media waypoints

fixes #83