fix somethings to make more easy