Patient done, some const consistency fixes, added generic Field class