fix reassignment of servers list and some conditional pedantics