More work on neighbor solicitations and neighbor advertisments