simplified parser
regexes improvements