Added more config options, fixed IVA bug.