Fixes #8 added more fields, parsed notes