Syntax edit + mem leak fixed