fixed some bug's