Fixing some bugs of Lexic part