fixed lookup stuff, implemented aliases