several fixes including invitation and approval