fixed some sets bugs