finish the reconstruction of and fix some bugs