Modify some bugs and add some abbreviation