Localisation fixes, plus some help for conference papers