Fixed file references and added outputting

Also quotes