command-t replaces with ctrl-p, some other changes