correcting typos and adding -y option