Minor: supported no braces parsing
Minor: fixed ordering problems