added default fields to fields API; cleanup