Make announcements more sparse, fix arrival announcements