Prevent potential Waylit silliness
Minor localisation fixes
Merge pull request #156 from thefinestsieve/beta

Beta
Merge pull request #2 from Meneth/beta

Sync with Meneth/beta