feedback changes and refix of bad name handling