Fixed a couple of bugs with argument parsing, everything appears to be working now