fix somethings
Somethings