Fixing different problems. Added new field types