added block comments, fixes for reference types, made macros a little smarter
matching fields now