added remaining options, fixed some typos