minor mod on the listings and their references