update to parse tex to dict
merge joe's stuff