Added and modifed some files for clean some things