replaced translator methods with more generic functions
fix messages