add filename to output, some whitespace fix