Improved error trapping; internationalisation; final touches to import