Modified and corrected some files