Textual improvements
Version bump to v2.1.7