Added the --conservative option, fixed typos