Export improvements/fixes

Some improvements/fixes for the commandline export functionality.

Basically ready to merge. Feel free to comment if you have any last-minute suggestions before CI finishes ;-)