Fixed some issues, setup filelist