Minor editing of files, not functional yet