Some new shortcuts and a new prompt