Hopefully fixed a couple command line parsing bugs...