bug fixes w/ g & r shortcuts