Add tags and fix annoucements