added contracts/types, new execution plan. basic sentence/identifier matching for later improvement