DB/SAI/Waypoints: Fix some sai and add some missing waypoints.