Revert back to -e
Change script to use current directory