Translation issues fixed. Closes #2 Closes #3