fixed and get one more bugs