Adding support for expressions.  Fixing bugs.