minor tweaks to Announcement form
add TODO