Add more logging and don't delete temp files