adjustments to xinit and terminator