Terminal fixes and updates