fixed abbrev table and etc