Fixed ALL the errors in the new terminal class