Add new files and fixes