Some bugs were fixed.