Parser- fixing some bugs