Textual updates from @Crell