prev-then-next fixes, and notes updated