a few bug fixes + building syntax.