Fixed a bug with blocks
Fixing fields update, unit test updates
Merge pull request #508 from khawkins/fields_fix

Fields fix