Fixed commandline args, ready for 0.0 key skew wrapup test