final fixes to make the reconstruction work