Tweaks to wording and speed improvements.