Added improved terminal