Added possibility to translation
Fixed Some errors
Small changes