error handling improved; parallel changes processing added