add goalcalendar and emend text