clened up files, added output and more names