merge fixes of syntax errors to master