Agenda adds, bugs fixed