Fixed up prev/next but still have cycle somewhere