Migrating old files and minor updates