2.05.4:Miaow:13 more work towards #142 + minor localisation fixes