Add plain terminal, clean up running strings