Added expression handling.
More tests and compatibility fixes.