Added Command-T, some other changes