few more quick edit to fix some typos and refine TBA messages