Bug/syntax fixes, data templating changes