Fixing up files for current work