Add file redirection
Remove ugly tee hack