Update of derived outputs and several other changes.