fix somthings
changed somethings