Fixed issues with terminal.
More updates.