Started fixing visual mode mapping