Command option parsing, fix POST bug

Here are a couple of more changes if you want them.