integrated equation parsing, still things to fix