Update text features to new API. Various bug fixes and additional tests. Coverage at 81%