various improvements including terminal name