Fixed mentions, tidied other bits & bobs.