fixed shortcuts and added buffer gator