number of bug fixes after testing
remove the -e option, which was essentially the same as the -f option anyway so its better to merge them