Some QA changes
School zone and some text changes