Moved several incoming waypoints to the POIs shapefile,
added the NotationMarks shapefile.