Fix bugs

* fix incorrect mapping ( making braces)
* add some abbrs.