small changes on parser