Closes #22
Closes #5
Fixed translations