some old bugs are fixed.