added more fields metadata
Merge pull request #1 from Stiivi/master

Added fields metadata and some field fixes