Bug fix for export plus a few nice things