Lots of maintenance to argument handling and config options