Added new files, update some others