Fade tweaks; fix waypoints in l6-7