touchups
Checkpoint commit for cleanup.
Parse small subset of supported computations