Update README to sync with current flags

And reorganize a little bit.