More code updates, inc better argument parsing