Further corrections to argument parser