better support for terminal