Minor changes - not all files are utf-8 'safe' yet
UTF-8 handling fixed (hopefully)
Reverted change to use tmp file loc