all files fix bugs