Tweaks to word order