Added a few files, modified a few