More changes and fixes for SMem branch.  Mostly works except for the adding of stuff from Soar...