added some translation confusion and infinite scroling