text feature, and bug fixes