change more files to fix bugs