fixes to get var-addr implemented.  Commented out some failing tests to get end-to-end run.