handle optional terminal capabilities slightly better