fix somethings and add new things