map table forwarding changes, passing half the test cases now