tidy ups and fix text