Fix/Update some basic files;