added trimming
fixed translation