merging work done so far - equations

still to do:
- 3rd review (@dongping ?)
- syntax corrections (would be probably easier with a build)