clean up roster code, restoring original ordering
restore full roster sync
handle missing roster item