added options as json and made some minor text edits
Merge remote-tracking branch 'origin/master'