fix for EOF
+__to_string
support for extra fields and functions