2.3/field types

Some updates and fixes