Some bugs are solved