New tsets added and bugs fixed