yet more fixes to entry-info