update todo
misc bugs wrt removal of an identity