Upgrade terms and conditions
Improve some wording