Some fixes have been made for left and right keys