more bug fixes

(this time to domain filtering, and labelling output files)