fix and add new files