Various adjustments to terminator config