continued lookup testing and bug fixing