fix position of holding field. Add missing fields.