lots of bugs fixed in new reconstructor