added extra fields

something fishy with the fieldset datastructure remains, finding stuff
by key does not yet work properly.