Fixed Rete issues in original BaseStormReteBuilder, still runtime errors being fixed

TEST DOES NOT PASS
merged