made output file names more sensible and removed old comments