passing more tests
improved lookup, passing a few more tests