more Text refactor and thoughts