token fix + memberlist fix