Improve terminal