some fixes for wrong and missing names