Adjusted several fields