some more text cleanup and cosmetic fixes