It's all there - shared administration of the Old City, 1 for 1 land swaps, two state solution, compensation in lieu of return for the refugees, I honestly cannot see the difference. Maybe the explicit offer to allow Jews to remain in Palestine as Palestinian citizens wasn't included in Geneva, but Fayyad has raised that recently, so it's hardly radical stuff. Except he's starting to get confused in point 14 and 15. These imply that the two future states will not have sovereign control of their own immigration policies. ie points 14 nd 15 contradict point 1. So he's not really talking about a 2 state solution but a 3 state confederation as per Belgium.
Suspect Bangkok bomber arrested, found with possible bomb-making materials (Reuters)
from the article: A Palestinian peace plan Israelis can live with