Change wording and minor tweaks