changed api to fix bad keyword override
fixed trailing commas, which broke compressed minify