fix_some_bugs