Improve wordings
Fix URLs