lots of cleanups to text