fileCount added, userName bug fixed