fixed some buges