fixes addressing PR comments
translations
moving to generic