Correct default keymap in makefile
Fix bug of matrix scan