Cleaning up translations; various tweaks; fixes #13