Fix url and some wordings