Please merge my PRs #229, #230 and #231. All three are minimal and fix bugs found during testing. I will also review the translations for Esperanto and brazilian portuguese someday. Thanks!