Improved text and other fixes