Towards a Better Climate Treaty