Fix typos
Refactor general options
Update README