fixed some bug and valluk