Adding default values for some fields, small adjustements