some of troubles with lookups resolved