Hanging comma fix
Improved event options handling