Added buffer shortcuts and removed superfluous things.