Fix Shoves, Caps names, and typos