Syntax fixes / testing