Few bug fixed.