tweaks to make "and" names work correctly