new files and fixes