Fixed up some issues, added optimization space.
pushing for re-test
Merge pull request #281 from gabeos/feature/algebra

Fixed up some issues, added optimization space.