Added more files, set defaults.