fix new bugs, change the shortcuts