fixed all remaining lookup issues