Fix some mistakes + announcements