fixed some sutff