Bug fixed and grammar corrections