Announcer fixes
Heaps of announcer improvements