since issue #28 is fixed i was cleaning up some source code
also i fixed some lookup issues