fixed some buggs
fixed some buggs