A few bug fixed.