Ironed out some final issues with the move to a config file