Re-arranged TerminalSession code to display standard prompt at correct times.