Some bug were fixed.