added support for comments in the fields