Fix option string, adding -e and fixing order