Switched Demo1 to use TMVars instead of TVars.  Cleaned up a few things.