Adding translations + minor fixes

Adding translations + minor fixes