identity lookup and tweaks