Peace between Israel and Palestine

Peace between Israel and Palestine seems to be a not too distant possibility.

My reading is that it has been more or less agreed that:

- Jerusalem will be the capital of Palestine
- Palestine will comprise the Gaza Strip plus Protected content % of the West Bank plus the equivalent of Protected content % of the West Bank, taken from Israel.

And that the disagreement point is the possibility for some Palestinians to settle in Israel.

Any comment, specially on the last point?